Move gdk_get_display to common code

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index a6197c28fcd0e9e9bf07dba8cfea62841f1469e0..cb8b9c2bcd809e4f01e7f2ba9d35bd237f55b937 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1849,6 +1849,12 @@ gdk_display_get_name (GdkDisplay *display)
   return GDK_DISPLAY_GET_CLASS(display)->get_name (display);
 }
 
+gchar *
+gdk_get_display (void)
+{
+  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+}
+
 /**
  * gdk_display_get_n_screens:
  * @display: a #GdkDisplay

diff --git a/gdk/quartz/gdkmain-quartz.c b/gdk/quartz/gdkmain-quartz.c
index 6e84756907a3f74104996e0ae37e4d3c41d2a810..dad1e544e7c989570bf4088e460d1386c0b5204a 100644 (file)
--- a/gdk/quartz/gdkmain-quartz.c
+++ b/gdk/quartz/gdkmain-quartz.c
@@ -61,12 +61,6 @@ gdk_error_trap_pop_ignored (void)
 {
 }
 
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 void
 gdk_notify_startup_complete (void)
 {

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index e48e2bef4094219cfa9e18d1ef36cfb7297996b6..e07c1ca548b83d026d30974aaa4e6679f56692d3 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -197,12 +197,6 @@ _gdk_windowing_exit (void)
   _gdk_display_hdc = NULL;
 }
 
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 void
 gdk_error_trap_push (void)
 {

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 2ce5e34875abec8002981fd94e59848bc8cb642c..91eb83d0f7be47fdbd839d9786bec69a19c990c8 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -545,12 +545,6 @@ gdk_error_trap_pop (void)
   return gdk_error_trap_pop_internal (TRUE);
 }
 
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 /**
  * _gdk_send_xevent:
  * @display: #GdkDisplay which @window is on